Minor changes

Mainly code style