Configuration cleaned up

Fixes #5