Added status constants
Cleaned up methods
Clean up