Clean up PollAPI.scala