Moved some vars out into private config file