Lots more refactoring
Making infill a percent rather than a line width.