[CORE-113] Using logger + cleanup
[CORE-113] Utility functionality
[CORE-113] Helper functions