A try to better code
Separation of tasks
renaming