Minor cleanup. Double-checked tests. Everything is good to go.