Updated some syntax and layout.