Refactoring: removed _id suffix from variable names