preparing code for next function

few changes to get the next planned function easier into the code