More comments and readability syntax updates.