refactor: remove comments, extract methods