cleaned code
default settings applied