Cleanup warnings, style

@JakeWharton