PR for dev_1.0

Adjusted all brackets in function and class lines.