Tidy
a few changes for competition