minor organizational stuff