Just changed a few things.

I thought it's better this way.
Merge pull request #1 from ProfessorXZ/master

Just changed a few things.