Clean code a bit, update jopt-simple to 4.5