bring code to more php strict standards