Some moving and reformatting to better fit the style and structure