improve constant ordering declaration