some small refactorings, and balancing to the current skills