style improvements

optimize imports and format code