#81 minor perf improvements