Fixed some code format whitespace and import definition issues.