Updated classes to fit our code style.

Fixes #9