conform a bit more to standards