added utils for Pjs version, some cleanup.