Got rid of the weird git stuff, hard coded defaults and fixed formatting