Class cleanup

Resolves #139