You should probably do that throughout the code, it makes it easier to follow/understand and that should make it easier to debug and find problems.

PS I don't mean replace everthing with Select Case, just kind of tidy things up.