Code cleanup/refactoring
Collision bug fix in progress (jumping through top)