fix settings usage
make style more consistent