FIxing some todos
Added lambda for parseFromFormat to make it easy to read