Whitespace and warnings cleanup