Better filepath/strip level calculation. Some cleanup.