cleanup and make it useful