Source code

Source code formatting
Javadoc updates