Cleanup variable names to match standards and misc other clean up
Remove _username in favor of USERNAME