DRM-39 code style and optimize imports and eof