reformatting and  removed mixed indentation