Remove warnings
Clean code