cleaning up + testing