Last before cleanup
Cleaned up interface and code.