Refactor and cleanup

Use Reference class for final strings