Small cleanups
Small fixes for source file