F1: Make code refactoring.