Uncommented some commented stuff