Less lines, more consistent variable use