1. Cleaned up sample code