added post increment / decrement + cleanup