manual: clean up code using Layer instead dicts
fixing configuration files according max step len