Created constant for "_id"
Code cleanup, renaming methods