Clean up and organize. comment unneeded code