Straight lines, better code