did some more organizational stuff