Refactored classes a bit; more modern syntax; ARC