Fixed whitespaces, comments, quotes