Refactor a bunch of code, to make it more lovely to read to all the other contributors of this project