More changes to dont repeat yourself
Move location of strip when reading values
Remove commented out print statement intended for debugging.
Finished first pass of dont repeat