Remove public. Also let's reformat all the ctor to our latest code style.