Code Fix/Reduce