review comments - remove unused import and extract out constants