Cleanup

Desing cleaned up, in the process of cleaning up for fabrication