refactor & rename
fixes
Merge pull request #13 from pinf/streamline

Streamline