Code cleanup: consolidate constants for dimensions