Force test update + more commenting.
Explicitly declared function args appropriately