Remove unnecessary "else; nil"