Organizing steps, cleaning up samba config