minor rename of the initial fields
continue minor refactoring add TO DO comments for replace of GO TO
command