New file and some cleanups