- Final set of code cleanups that I missed in the first review