declaration of the temporary variable removed from the Step macro fixes #51.
some code indentation and documentation