fixed some indentations and some code standards