Use File::Spec instead of manually hacking. Cosmetical changes