Organizational Edits

Made some minor edits to make the code easier on the eyes.