remove lazy strok usage + tidy up key value parse