Readme update, test and refactor