Fourth commit

Refactoring
Option 1 OK