General code cleanup, removed some unnecessary comments.