Cleanup: un-needed else if