cleaned up references and renamed