moved some code to one line