Simplify if and return statements.

If there is a '+', I think the length of the subtype is always greater than the suffixIndex. - '+' does not exist. -> lastIndexOf() returns -1. - '+' exists -> '+' is in subType[0 .. subType.length()-1]