- Use pk_package_id_build instead of older build method based on
  template sample
- MOre identation fixing