code clean up

thanks noah