Some refactoring, code cleaning + add robot actions.