Improve short code