Made code more readable, code cleanup.