fix php 5.3, style fixes