Refactored, removed unnecessary dependency