refactor application static