Quick restructure to make it easier to read