Refine class, update readme