3: Code quality improvement 
Task-Url: https://github.com/mjremijan/ferris-tweial/issues/issue/3