Improves our code quality by fixin some warnings.