ide demo - code clean up for mock up