Less bad code this time around.