Made small code style changes

#1884