Fixed bugs in docblocks
Removed redondant elseif