ParentalControlSetup: Cleanup and suggested fixes by Dima73