wooooooo some cleanup