Tweak path
Clean up