Fix some warnings
Formatting of code