Formatted files via Eclipse to hopefully have correct spacing/ident.