style, white spaces and comments fix