Adding OAuth data handler and made some cleanup after many weeks of Scala