address markhamstra comments with droping extra code