Some other refactorings and stuff I dont want to write anymore commit messages