Simplify boot storage

temporary mean, plan is that I today create class for such mapping, I only want to firstly slightly refactor method, so I get what it do. Now I understand all strange internal variables, so I can refactor it to own class.