Slight stylistic refactor + comments