Cleaned up code; removed unneeded qualifiers & stuff.
Merge pull request #160 from raistlinthewiz/develop

Cleaned up code; removed unneeded qualifiers & stuff.