cleaning up the config code a bit (see #5)