cleaner naming and syntax (wip)