after hlint and some comments