fix regex
clean up client file, fix regex