Cleaned up Indicative lib code