More whitespace and static import cleanup