Organize imports
OVT-7393: Fix curly bracers on ifs