Slight syntactic refactor