Make it shorter and nicer