Removed comments.
General refactoring.