Slight update to syntax and redundancy