Eclipse correct formatting
Final comments added
final version ready