refact
rename static members
add extractors