Formatting needed files
OSGI class changes reverted, format applied