Refactor ALL the files \o/