reformatted source and fixed sonar-project