Code cleanup + source jar