Cleanup

Some very small cleanups