ALIEN-513: Clean code