code cleanup
using options client construct