[REFACTOR] Made smaller