Partial lint cleanup (whitespace, relative imports, etc)