Updated headers and line lengths for class split extension