fixes #2
general cleanup