cleaned up strand.rs a bit