Updated formatting, Source clean up