FEATURE: code improvements according the specification
FEATURE: code improvements according the specification