Even more cleanup
Got paddle position sustain working, some refactoring