Big style update
Further clean-up for new class setters/getters