Revert "some more fix"

This reverts commit 4cae02f02095f61c052f454b98e4b6ac073b5bea.
rename StyleRun to Style
small changes
simplify style location
remove Ref
bug in Call