Cleaned up signin process