(#60) Quick Fix: simplified some code.