Windup 210: Simplification of Classification and Hint

Not sure if you will like the classification simplification, it is quite hacky.
However, I seperated both simplification to two different commits.