Refactor to meet bonus specs in readme