[CLEANUP] - CodeStyle, comments and variable names