Attempt to make import style more consistent