minor cleanup... but still not working for some reason