rearranged code and removed pushover info

rearranged the code to make it easier to read and removed my pushover
account info.  the token api will be deleted so dont even try to use it.