name variables for maintainability
Merge branch 'refactor/cleanup' into coins