Source code cleanup, using default Java CS and rebuilt jar