Meter class introduced, linebreak cleanup