Started mass code clean up and changes