Updated comment and cleaned code