code refactor, optimalization of imports