Cleaned up the code site-wide.