applied upstream-recommendations regarding codingstyle etc.