Refactor & housekeeping :P
Config Options