aaand even more minor cleanup