working... and cleaning up