added missing code and uncrustified