- extract methods as utility class
- add doc fields