removed unndeed whitespae and fixed all indentation