#69 Cleaned the logic package.