Code-standardized
Preparing for merge with the Development-branch by updating what we have
with the project's code standard.