fixing indentaions and convintions