pushing cleaned up code