Issue 6

Made some changes for consistancy.