Fixed better commenting