Clean up a bit, greatly improve commenting