simple changes

some simple changes we've talk about earlier this week :)