Fixed Runner format, cleaned up a few code smells and fixed a written issue.