Small cleanup, stable version :).