Minor style changes
Adding changes for multiple oauth clients