small changes

some indenting, function names were changed.