Refactor Analyzer component as per #20
fixed CS