Formatting fixes, forcing php 5.4+