got rid of constants, other redundancies