Fix indentation
No need to look for the same attribute twice.
Add a few missing NSCalendar API.