clean code for release preparation