Closed #11. Some cleanup.