Slight cleanups. Dusting this off so I can use it to test out Ansible