Simplify the code
Simplify the code