More cleanup and refactoring.
More refactoring and cleanup and separation of o.ua => moxie.core.utils.Env.