Fix whitespases and comments