Standardize getters

targets #307