Improve read-only style