Some more refactoring/tuning.
1 file changed