(#40) cleanup for initial release
(#40) cleanup for initial release