Trying to cleanup a little bit.