CS & Fixed closure for php 5.3