Polishing

Review and adjust of finalized items in order to use them as baseline
for next commands.
Changes include naming of elements for syntax highlighting to make
different elements more evident