Code enhancements: NIL usage is removed.