Simplify the code

...