Minor improvements
Rewrote to keep striping code separate