Some basic refactoring of data classes, primarily on getters and setters to improve readability and/or follow naming conventions.