Some refactoring of recordstore

- more meaningful naming 
- remove un-needed methods
- removal of some repeated code