Added minor changes, fixed Coding Guidelines using roslint