Did a couple quick revisions/clean up