Reduced class names and used more syntatically correct <main>.