taking out commented stuff