Code esthetics

Make all .lines methods use same sane variable scheme and use fewer
calculations.