Warning and style cleanup

@JakeWharton