Cleanup warnings, style