MNT : reorganized code + imports