Reducing usage of env-variables + making it cleaner