Add demo target, tidy imports