Uncommented a few things