#3. clean code, and revert 48a3a4b.