Competitions - backwards compatibility

Also some code deindenting