Dang. Thanks @theJenix a re-factor sound like a good idea.