Cleanup code to have consistent feel across files.