Resource shorthands: indentation tracker, numerous refactorings