Removed unnecessary abstraction