some code indentation and formation are updated