Code Refactor - Add EMPTY_STRING constant, remove unused imports