Final clean up to make sure everything lines up