Removed debug + refactored NSDate class