Am I doing this right...?

More import / formatting cleanup.