Stylistic changes based on JakeWharton's feedback