removed type und unneccessary comments