minor comment improvement
refactored input validation in no-dels and subs-only
renamed internal variables of functions for consistency