Clean code and warnings