Clean up the code after the previous pull request