change accessors to make them all consistent
Merge pull request #298 from ianstormtaylor/clean/accessors

change the accessor logic to make it more consistent