Refactoring: Indention, comments, async