Made some cleanup.