Trying to clean up my mess some.