#10 Remove unnecessary comments