Reusing more code