Fix format of some code and rename checkboxes.