Made sample easier
Further clean up