Cleaning up after teammate feedback. Removed useless classes, and created helpers where needed.