add proguard and code clean up