Refine code
Shorter code