Rename file
Refactoring
Improve design