Big Clean up (due to whitespace into empty javadoc line) + some quality
issues fixed