Fix spaces and remove unnecessary extension