Clean up spacing on some import and package statements