Cleaning up my orgainization wish i should have done first