Some cleanup of constants