Fix competition edit form upon validation error
Code cleanup