Tidy up utils and cleaner Client