Better code!