Removed un-needed comments, refactoring.