Deleting an unnecessary class
Fixing some inconsistencies