Some changes in easyot to better read the code