Commented and organized
Fixed