commint before going back to weaver_feature branch
code cleaning
code cleaning