refactor the two problematic files to the static section