Clean up coding style a bit.
Use correct value for tolerance in non-fatline code again.
Further simplify code a bit.