solved rang_6 refactor issues. polish, delete comments and select a single
refactor for pull