Class rewrites for clarity