Fixing minor syntax errors and running a make fmt