removed unneccesary imports. more refactoring