further minor efficiency changes