Changes suggested from powershell review