Clean code
Rename some vars