a heap hlint and some other cleanup