Fixed some formatting issues with mock.py modules