updated
some cleaning up