A little less spaghetti like...