* Refactor block scope constants