Increase maxstatements, few style fixes