refactor
cleanup and update readme