Refactor doing it more simple and clear