Removed some class redundancy.