Set constructor to public and remove config vars