Clean up. Making source ready to be pulled into PSOVisualiser