Cleaned up some code, fixed secret token