Cleaning & 0-bug-fix