Moved around a few things to have a DRYer layout