rearrange things and use static imports