Cleanup and fixed radio button error message