REFACTORING Changed id from local variable to constant