Cleaned up paddle class