BASE. Final Code Cleanup on very solid MVP.