restructure code (logic, draw, activity)
add comments
add junit test