Move type statement, fix comment