Ya, i'll do a cleanup pass in another PR