Significant cleanup in the prettyfied code.