Minor clean up
Consolidate into one file