Add gravity

And some code clean up