refactor config file parsing a bit

UCC git Repository :: git.ucc.asn.au