Wrap line and group imports
Make some stylistic code layout changes