Cleaned up some formatting and other lint issues.