Refacoring. First day...