Comments and tidy imports