fixed an issue with circular outer classes in Dexpler and optimized the code a bit