Make PHCS more functional