Removed redundant non-const getters. Code clean up.