issue #24 code optimization and formatting for Constants