simlify + cleanup