Minor cleanup, improved Proguard config