removed multiple files; coding style review