remove comments and refactor