Add comments for refactoring guides and reindent