Some refactoring on the last added things made