Cleaned up user check