Corrected name and shortened code