remove explicit check on .nil?