Clean up interface
Merge branch 'code' of https://github.com/opticsthewebsite/OTWhome