code cleaned, and client service created