refactored, updated readme