Applied source code formatting after merge.

There are a code style formatter and clean up configurations available
in the `[ROOT]/project/` folder. If using Eclipse, then these style
definitions should be applied on at least a project level configuration.