made code a bit more easier to read
Remember the config