WIP: use commonplace and cleanup