Cleaning up inital commit