Changed method name
Added docstrings
Fixed correct identation
Added settings holder and unit test