style refactor
policies ut approach