6 - commenting and clean up - timestamp 3 hours 45m