Updated some syntax and placement for consistency.