Cleanup and commenting Steps