Further code cleanup, IDEA, ProGuard