Refactors and stuffs