Cleanup, renamed variables User and Apikey to be more specific