Follow-up: move variables to getters