Slight ng refactor