Code refactoring, added blinder + bracket models