fixed imports and cleaned stylish