+ Fix gcc build errors/improve whitespaces