removed unneeded return statements