Refaktor initial cleaning-up