- Moved code to external class