Updated paddle and cleaned up code.