reformat some code to be compatible with php 5.3