Cleaning code style

Too many IDEs, too many years... was time to clean up code style.