cleaned commented stuff