Some minor syntax cleanup