Cleaned up PCS a bit