working w/ some clean ups