Fixed circular import and bad whitespace.