Refactor

that's a good idea!