Updated Nerve dependency. Code cleanup.