Removing comments and small code cleanup.