Add checkbox style
Remove useless variables