cleaned up piping