Added better commenting