Lectures refactoring