Minor clean up, more to come.