fixed some indentations in the code / cleanup