Clean code
Some improvements