Adding fixes with comments, whitespaces, break new line