Cleaned up code; removed unneeded qualifiers & stuff.