More cleaned up.