cleaning up, +additional info