Cleanup, formatting, organizing imports