Comments + Refactoring