conform a little more to dart guidelines regarding format