remove comment code
refactored statuses to enum