Fix style, add missing imports