Minor refactoring to allow for better hitbox handling