commented and cleaned
merge comments with social login