Commenting out imports + updating class modifiers