A small refactoring to removed unnecessary field