Refactoring and commeting