clean up and add php version as a variable in builder