Fix CS warnings, general cleanup in same files