Simplify code
Refactor
Refactor
Refactor