Could we get the methods a bit shorter? The complexity is quite hight in this file.