Bunch of refacoring