refactor: comments, variables, spaces