hlint and slight fix