More cleanup.  Using constants more consistently across the codebase. Optimized imports