More documentation... More annotations... More reformatting...