#13 Remove duplicated code block