Cleaned up code more. a class was incorrectly set as private