code indentation and other are fixed