Abstract refactoring
Removed unnecessary comment