Clean code and suppress warnings