Move getters/setters so they are underneath their declarations not scattered about in the class