Refactor : make it readable