removed some lines to make it more concise