rapid cleanup; tiny optimizations. promise it is not too complicated in the diffs =]