I love seeing this in red :+1:
Great cleaning up of unnecessary repeated code.