Code format and style changes