Refactoring, getters, readme.