dokoncen refaktoring pracovist

Change-Id: I6c9426af559d67c969c9be37352827c2a3b093d0