Refactoring every case, yay....