#552 - Extracted cell identifier strings into constants