dirs; padding; refactoring