Cleaned up and renamed to class scheme