Fixed ugly code on all models
Fixed ugly code on all models
Minor changes to format of boot files