Cleaner and annotated code