Updated code style to match VS