Reduce cyclomatic complexity and unify allocation functions#9

giacfalk wants to merge 2 commits intomaingiacfalk/locationallocation:mainfrom

reduce-cyclomatic-complexitygiacfalk/locationallocation:reduce-cyclomatic-complexityCopy head branch name to clipboard