Cleaned up loft over classes