Code refactoring: unnecessary comments removed