More code style tidy-up
Code style conventions