Refactor myself logic