Refactoring Code; Keep simple