bluk refactor