Misc code and comment cleanups