Minor cleanup

Code cleanup, formatting changes