Code cleanup, error handling

Modified a few variable names and tried to make code shorter.

Added error handling for a username that does not match with the one
found online.