Remove tabes and unnecessary code 2