Clean code a bit, update jolt-simple to 4.5