re-formatted class