General code cleanup and some comment updates.