Make it shorter and more elegant