Minor edits to different things, styling, cleaned up some code.