Organize imports & clean up warnings