Quick code clean up.. Still things to come