implemented PROBCORE-304 + some cleanup