+ added Loki
- performed small refactoring