Clean code for release