#23 removed redundant constants