Fixed robot naming
Some style fixes