Improve hit boxes

And do a little bit of refactoring.