Clean up old code
Fix drawing point, refactor Paint