Refactor

why? Add a comment