Minor changements

Redeclare the server configuration as optional (after discussion with Damien) + changed some things here and there and cleanup the code.