removed unneeded code
Gave class better name