cleaned up client and added note to server