refactor C1Q5

giving better names and adding more description.