Static refactor

enjoy