Cleaning up some whitespaces