fixed all identation details