Fixed minors.
Cleanup