Cleaning up and pushing

Unfortunately, I'm not sure what is going on with this commit.