?
Removed unneeded code and fixed a bug.