Updated the title + code style fixes.
Additional cleanup.