Clean code for release, again