Changed GOTO into smarter if statements
Changed formatting
Merge pull request #58 from ZackAlfakir/master

Is this any better?