Added Chef server to output, some clean-up