Cleanup checkbox check checking