Major code clean up!!