- Remove Unused Code
- Add Override Annotation to onDraw