Modernize and Streamline

Please validate and merge if you like the small updates made to cmake-init.