Performed some really small code cleanup.
Did some small refactoring.