Comments, refactor