Reformating long lines, renaming some buttons, getting rid of useless variables