Definitely get a fix in sooner if something's broken, but I wouldn't worry about a code cleanup or refactor of this right now.