Bit of cleaning and commenting

No difference in functionality