Debug cut and general cosmetic cleanup
Merge branch 'cosmetic-fixes' into develop

* cosmetic-fixes:
  Debug cut and general cosmetic cleanup