Change config file handling to let config file and constants be a bit more DRY