cleaning up some stuff #4