removed unneeded namespace
fixed docblocks and removed whitespaces
removed unused  variable