Add #pragma mark
Use self instead NSDate if we can