Style and import fixes