Cleanup

1. Minor reformation
2. Improve Draw