Remove tabes and unnecessary code