Cleaned up redundancies.