More cleanups.
Making code more readable.