cleaned up getter/setter names
updated names