Small changes to code, removed all references to robot object