Some small syntax cleanup