Fixed some typos and removed some redundant code :D