+ improve whitespace, fix warnings