Made classes more DRY