cleaned up code and pushing up