Another changes in code, to keep it more readable