Removed unneeded else statements.