Refactor

globals