saving options again
code cleaning and linting
linting