Added new constant and tidied code for SCI-1895