Cleaned up checkboxes for issue #5