replaced with single calls

some better readability