fixes #2 and cleanup