Update classes to be cleaned up

The code compiles on Visual, that's a first step. That means everything
is well declared.