Fix incorrect inclusion of AssetTagHelpers

Fixes incorrect inclusion of AssetTagHelpers.
Cleans up and reorganizes code al little.
Separates environment step from initialization.