Removed comments
Minor refactoring.