Clean up some code to make it more clear.