Introduced and fixed indentation rules.
Removed env-specific code.