Minor refactor/simplification

@biyeun