First commit, just works
Minor clean up