I like #2, but the second way you did it.