Iteration 4: Code Quality and State Pattern

... will be posted later...