start with some minimal cleanup, things don't look pretty right now -
what about tests?