405119 Tidy up comments and code formatting for osgi