Rename functions to more understandable names, refactor... Just a WIP commit