make the if/return style consistent