minor non-functional updates

updated variables names, some strings and transformation array moved to
Factory as constants