refactor

@class & replace odds
plus mara