stil refactoring