Styled machine year and machine manufacturer

All tests pass.