cleanup & internal refactoring
Release 0.0.4