Remove extraneous conditional code

If each conditional is returning something, then no need to check for else, since if the PHP parser has got to the next part, it automatically must be the else state. Keeps the code cleaner and easier to read.