Style fixes and options.cwd