[Building Utility] Some delinting. Remove unused import. Handle possible undefined variable use. Whitespace.