refactore to one line calls