Cleaned up the code and ini scripts.