Refactor / cleanup code
Updated the README doc