Added proper comment and removed genericname