[#86] Clean up the code formatting.