Bit of tweaking here and there

Decreasing line counts