code refactor
removed on abstraction layer