Add private to the variables
Use final
Remove  commented out code
Small improvements
Add class diagram and ssd diagram