Yeah, that's what I'm doing at the moment, just looking to clean that up a bit. It is working though, so I guess I can leave it.