Refactor for stast class + junits