Clean code
Cleaning