Import and styling fixes according to conventions