Minor cleanup...
Merging lines of work...