Clean code, remove somes warnings