Added shutter sounds for both methods. Code cleanup.