Add option to specify copyright holder and clean up style.