Refactor of compile-time constants