comments cleaned, code organized
Card 2 comments cleaned, code organized