Cleanup as per meeting with prof boyd