Cleanups/nits
Cleanups pt. 7