Proguard, refactoring and add comments