Quick comments and refactor