quick code review

quite sick this morning, let's start with a quick code review