organize imorts & code formatting