Code style updates to controls