Updated readme, slight refactoring