Clean up code. Moved data operations to Data.

As well as a few assorted minor adjustments(such as the bounce speed-up
being removed).