fixing #26: code cleanup

Could this be marked readonly?